Repository navigation
Resolve conflicts: scalar-generated into scalar-next - #31
Merged
Simon Liang (AgentWings) merged 5 commits intoNov 11, 2026
Merged
Simon Liang (AgentWings) merged 5 commits into
Simon Liang (AgentWings) merged 5 commits into
Conversation
4 generated files changed with no detected API surface change (documentation, examples, or file content). Build: JC6W8hbP7PPwyiSPfrvUp
Use Scalar's generated RFC 9562 UUIDv7 helper for API-compatible retry keys. Preserve image helpers, package integrations, contract checks, and release metadata from scalar-next. Verified both module typechecks/builds, generated workflows, formatting, pinned API contract and mutation tests, and all 43 installed SDK tests.
- Property `policy.cpu` type changed from `enum(on | off)` to `autoresizing_switch`. - Property `policy.memory` type changed from `enum(on | off)` to `autoresizing_switch`. - Property `autoresizing_update.cpu` type changed from `enum(on | off)` to `autoresizing_switch`. - Property `autoresizing_update.memory` type changed from `enum(on | off)` to `autoresizing_switch`. - Added schema `autoresizing_switch`. BREAKING CHANGE: 4 breaking changes to the SDK surface. - Property `policy.cpu` type changed from `enum(on | off)` to `autoresizing_switch`. - Property `policy.memory` type changed from `enum(on | off)` to `autoresizing_switch`. - Property `autoresizing_update.cpu` type changed from `enum(on | off)` to `autoresizing_switch`. - Property `autoresizing_update.memory` type changed from `enum(on | off)` to `autoresizing_switch`. Build: SnEyxlUcXNHo5NK412Uf1
9 generated files changed with no detected API surface change (documentation, examples, or file content). Build: PxBlS5x7VncwMmSYymVbm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The latest generated output on
scalar-generatedconflicts with the custom code onscalar-next(buildJC6W8hbP7PPwyiSPfrvUp).1 file conflicted — the regenerated output and your edits on
scalar-nextchanged overlapping regions (an edit next to a regenerated line is enough to collide):src/client.tsResolve the conflicts here, then merge this PR into
scalar-next. You can also resolve it locally:git fetch && git checkout scalar-merge-conflict--build--JC6W8hbP7PPwyiSPfrvUp && git merge origin/scalar-next. The platform will not touch this branch while your resolution is in progress.Warning
Do not squash or rebase this PR — merge it with "Create a merge commit".
Squashing drops the merge ancestry, so the next generation re-conflicts on the very lines you just resolved. If Squash and merge is the only button offered, turn on "Allow merge commits" under Settings → General → Pull Requests first.
The platform detects and repairs a squashed resolution on the next generation, but that is a fallback, not a substitute.